projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c535da 3c8ef09)
bitkeeper revision 1.1389.1.36 (428075b7XUww-l4YTG96au0lbtOO_g)
authorcl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]>
Tue, 10 May 2005 08:49:59 +0000 (08:49 +0000)
committercl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]>
Tue, 10 May 2005 08:49:59 +0000 (08:49 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.